Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport release-1.27] Harden etcd subcommand usage and validation #4217

Merged

Conversation

@twz123 twz123 added bug Something isn't working component/etcd area/cli backport/release-1.26 PR that needs to be backported/cherrypicked to release-1.26 branch labels Mar 28, 2024
@twz123
Copy link
Member Author

twz123 commented Mar 28, 2024

This needs #4219.

twz123 added 2 commits April 3, 2024 09:01
This is usually the way etcdctl displays member IDs. This makes it more
intuitive and easier to correlate with etcdctl's output.

Signed-off-by: Tom Wieczorek <[email protected]>
(cherry picked from commit a8ce70b)
(cherry picked from commit dfb5bfd)
(cherry picked from commit 88d956d)
The etcd leave subcommand can be used to remove k0s nodes from the etcd
cluster. If no IP address is specified, the default is to remove the
current node. The IP of the node to be removed can be specified with
the --peer-address flag. However, it's quite tempting to just pass the
IP as an argument, like this `k0s etcd drop 192.168.0.0.3`. This extra
argument will simply be ignored, and the leave subcommand will use its
defaults. This can be _very_ confusing, and also quite dangerous, as it
may remove _different_ nodes than intended.

Improve the subcommand by making it fail if arguments are passed to it.
Add validation to the --peer-address flag and improve the usage strings.
While at it, make the etcd member-list subcommand reject any args as
well.

Signed-off-by: Tom Wieczorek <[email protected]>
(cherry picked from commit 477d354)
(cherry picked from commit 6a19b5f)
(cherry picked from commit ff33c56)
@twz123 twz123 force-pushed the backport-4210-to-release-1.27 branch from c93e33c to 6905070 Compare April 3, 2024 07:02
@twz123 twz123 marked this pull request as ready for review April 3, 2024 09:52
@twz123 twz123 requested a review from a team as a code owner April 3, 2024 09:52
@twz123 twz123 requested review from ncopa and jnummelin April 3, 2024 09:52
@twz123 twz123 enabled auto-merge April 3, 2024 09:52
@twz123 twz123 merged commit 6578749 into k0sproject:release-1.27 Apr 3, 2024
68 checks passed
@twz123 twz123 deleted the backport-4210-to-release-1.27 branch April 3, 2024 09:54
@k0s-bot
Copy link

k0s-bot commented Apr 3, 2024

Successfully created backport PR for release-1.26:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/cli backport/release-1.26 PR that needs to be backported/cherrypicked to release-1.26 branch bug Something isn't working component/etcd
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants